add boost 1.48 as an acceptable dependency version in cmake #869
Merge branch 'bugfixes/tokumx-1.3'