Merge Boost.Align from develop