Merge release/2014.05 to master