Merge branch 'develop'

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

test/all/Jamfile.v2

@@ -1,7 +1,7 @@
 #
 # Regression test Jamfile for boost configuration setup.
 # *** DO NOT EDIT THIS FILE BY HAND ***
-# This file was automatically generated on Thu Aug 13 16:32:12 2015
+# This file was automatically generated on Fri Jul  1 18:47:25 2016
 #  by libs/config/tools/generate.cpp
 # Copyright John Maddock.
 # Use, modification and distribution are subject to the 
@@ -319,6 +319,9 @@ test-suite "BOOST_NO_CXX11_SMART_PTR" :
 test-suite "BOOST_NO_CXX11_STD_ALIGN" : 
 [ run ../no_cxx11_std_align_pass.cpp ]
 [ compile-fail ../no_cxx11_std_align_fail.cpp ] ;
+test-suite "BOOST_NO_CXX11_THREAD_LOCAL" : 
+[ run ../no_cxx11_thread_local_pass.cpp ]
+[ compile-fail ../no_cxx11_thread_local_fail.cpp ] ;
 test-suite "BOOST_NO_CXX11_TRAILING_RESULT_TYPES" : 
 [ run ../no_cxx11_trailing_result_types_pass.cpp ]
 [ compile-fail ../no_cxx11_trailing_result_types_fail.cpp ] ;