Merge "There is no GCC 4.6. am: 7ca1829 am: 4fa2558 am: f6a93e5" into nyc-dev