Merge from trunk:

* Do not treat critcal errors as bad_lexical_cast exceptions, but if exceptions are on, throw correct exception instead (refs #8966)

[SVN r85331]

libs/conversion

@@ -1 +1 @@
-Subproject commit 7e484c17f69fb09a6598691da90540fb7b5cccfc
+Subproject commit 4ba64ea889e2e9b6cca696124fc7037ed8cf06b3