Merge branch 'refs/heads/develop'
fix for undeclared variable
Merge branch 'refs/heads/bugfix1'
bump for bug fix
Merge branch 'refs/heads/develop'

Conflicts:
	CHANGES.md
version bump