Merge branch 'release/0.6.1' into devel
Merge branch 'hotfix/0.6.2' into devel

Conflicts:
	README.md
Merge branch 'master' into devel
Force chkconfig to run
Bump version to 0.6.3
Merge branch 'release/0.6.3'