fixed https://svn.boost.org/trac/boost/ticket/10844
reverted previous fix in favor of a warning disabling #pragma
Merge branch 'develop'