jos db4a004e58 Merge branch 'develop' into v2
Conflicts:
	HISTORY.md
2015-02-20 19:56:12 +01:00
..
2015-02-20 19:56:12 +01:00
2015-02-17 21:18:25 +01:00