Lint fixes
lint
lint
Merge branch '2014.7' into develop