Merge branch 'boost'

Conflicts:
	README.md
Merge branch 'boost'
Merge branch 'boost'
Merge branch 'boost'
Compiler information
Merge branch 'master' into boost