Bug 815093 - Merge master
Bug 815093 - Some fix to the new jshint