Glowbal 050384e960 Merge branch 'release'
Conflicts:
	docs/_config.yml
	docs/_config_dev.yml
2016-11-25 00:08:32 +01:00
..
2016-11-25 00:08:32 +01:00