Matthew Nesbit a3c6ef351d Merge remote-tracking branch 'remotes/open/master' into mnesbit-merge-20180530
# Conflicts:
#	docs/source/changelog.rst
2018-05-30 11:12:25 +01:00
..
2018-05-22 15:38:43 +01:00
2017-09-22 16:51:14 +01:00
2017-09-22 15:14:16 +01:00
2018-02-28 14:12:54 +00:00
2018-02-27 10:21:03 +00:00
2017-09-29 17:42:49 +01:00
2018-05-29 11:32:43 +01:00
2018-05-29 11:32:43 +01:00
2018-01-16 15:29:26 +00:00