Fix name of autocombo.js (should be all lowercase)
Merge remote-tracking branch 'origin/develop' into develop