copied from 2014.0rc
Merge branch 'release/2014.0'