Merge pull request 'Don't treat js/css as binary in git anymore' (#397) from norm...