Minified without merge errors that were present in previous version.
Merge pull request #959 from Shelob9/patch-1

Minified without merge errors that were present in previous version.