Merge release/2014.05 to release/2014.12