Merge branch '2.2'
Merge branch '2.2'
Merge branch '2.2'
Merge commit '8c9a6c3'
Fix release notes versions
Merge branch '2.2'

Conflicts:
	version.sbt
Fix #101. Breaks #83.
Merge branch 'master' into 2.2