Merge remote-tracking branch 'kealan/config-js'