JBLOGGING-100
Merge remote-tracking branch 'origin/master'

Conflicts:
	open-source.html