Paulus Schoutsen eaa8e5f29d Merge branch 'pr/2139' into dev
Conflicts:
	.coveragerc
2016-05-29 15:02:24 -07:00
..
2015-09-17 00:38:52 -07:00
2015-12-27 16:57:16 -08:00
2016-05-28 18:38:46 -07:00
2016-03-09 11:15:04 +01:00
2015-11-15 17:43:38 -05:00
2016-02-14 13:04:42 -05:00
2016-01-16 10:17:26 -05:00
2015-09-20 11:00:35 -07:00
2015-09-17 00:38:52 -07:00
2016-03-26 16:21:27 -04:00
2016-02-14 13:04:42 -05:00
2015-09-17 00:38:52 -07:00
2016-05-21 15:01:34 -07:00