Merge branch 'release/2014.08.25'