Fix to accommodate upgrade of Boost to version 1.57.0.
Merge remote-tracking branch 'origin/next' into MAID-432_boost_1_57

Conflicts:
	CMakeLists.txt
Merge pull request #61 from Fraser999/MAID-432_boost_1_57

Fix to accommodate upgrade of Boost to version 1.57.0.