version 2.0.5
Merge branch 'v2.0' into v2.1

Conflicts:
	VERSION
Version 2.1.1

[makedoc]
Merge branch 'v2.1'

Conflicts:
	VERSION