Merge from trunk

* Fixes #7799 (optimizations with std::array were not used)
* Fixes #7831 (documentation update)

[SVN r82224]

libs/conversion

@@ -1 +1 @@
-Subproject commit dbda7689e0609d822f5f9ddf893dd7acf91366a5
+Subproject commit 16890bf0412506356841f0f25654b95fb7d1e5f7