...
Merge branch 'release/2014_07_07_1'