Merge branch 'release/0.2.5' into develop
0.2.5.post1: don't issue deprecation warning for 'settings_path' ALL the time, doh.
Merge branch 'release/0.2.5.post1'
Merge branch 'release/0.2.5.post1' into develop
0.2.5.post2 - don't issue deprecation warning for `settings_path` ALL the time, doh.
Merge branch 'release/0.2.5.post2'