2.0.0 released
Merge commit 'e6592cda0d52033677d6144afd27ef8b48c3cb5f'

Conflicts:
	build.gradle