Request: Merge from develop

Specifically very interested in having 787e283 ("Change name of boost::align so it doesn't clash with other stuff.")  in master as Ahmed kicks off the review process for Boost.Align.