Add configs.
Merge branch 'master' into gulp_test