Merge branch '2014.7' into develop
Merge remote-tracking branch 'salt/develop' into develop