JSHint
Merge remote-tracking branch 'origin/feature/structure' into feature/structure