Merge from master

Conflicts:
	CHANGELOG.markdown
	README.txt
Merge from master

Conflicts:
	CHANGELOG.markdown
Merge from master
Merge from master

Conflicts:
	CHANGELOG.markdown
Merge from release

Conflicts:
	CHANGELOG.markdown