Merge forward from 2014.7 to develop

Merge forward from 2014.7 to develop