Merge "jshint: Enable 'es3' option"