Joe Thornber 803b2f3a40 Merge branch 'v0.7-devel'
Conflicts:
	VERSION
2017-03-08 11:05:50 -05:00
..
2017-03-08 11:05:50 -05:00
2016-06-01 14:46:27 +01:00
2016-06-01 14:46:27 +01:00