Merge pull request #1810 from antonio-nino-diaz-arm/an/setjmp