Merge branch 'wip'
Merge branch 'wip'
Bumped version
Merge branch 'wip'
Moved function import before config_site

Otherwise the $black-xx variables wouldn’t work.
Merge branch 'master' into wip