re-enable merging
Merge branch 'master' into RELEASE_20140325