Merge "Build from master with 2014.2.b2"