Boost 1.54, v120 support
Merge remote-tracking branch 'remotes/BanTheRewind/dev' into dev