Fix merge 2014.05
Finish fixing merge conflict
Merge pull request #72 from andylyall/develop

Develop