Fix bad copy from branch
Merge pull request #197 from andylyall/2014.05

Fix bad copy from branch