Merge branch 'release/0.2.4.post1' into develop
0.2.4.post2 - settings_path param renamed to settings, as now it can be a dict or a pathname
Merge branch 'release/0.4.2.post2'