Merge branch 'HotFix20131001'

* HotFix20131001:
  Corrected line ending changes created by previous commit.
Merge branch 'master' of github.com:kpowick/script

* 'master' of github.com:kpowick/script: