Compile on GCC 4.6.3.
Merge branch 'tim_map_watchable' into tim_map_watchable_scale_test