Attempted to fix localization issue #M-281.
Merge remote-tracking branch 'merchello/1.3.0' into 1.3.0
Commenting .Web code
Merge remote-tracking branch 'merchello/1.3.0' into 1.3.0
Merge pull request #690 from rustyswayne/1.3.0

Commenting .Web code