Bugfix: default >> defaults
Merge branch 'master' into topics/prosody