Merge "Status: Fix JSHint violations and commit settings"