4f9ba08 Merge branch 'release/20140710'