Merge 2014.7 into develop

Merge 2014.7 into develop