Merge #117, upgrade embedded boost to 1.53 with unordered_map and
some others