Nick O'Leary 41445a1b48 Merge branch 'config' into 0.14.0
explain why this merge is necessary,
2016-05-04 15:44:48 +01:00
..
2016-04-07 17:08:51 +01:00
2016-05-04 15:44:48 +01:00
2016-04-18 12:38:32 +01:00
2015-10-02 21:27:30 +01:00