Tweak configuration.

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch 'master' into develop