from changes branch
Merge branch 'master' into changes

Conflicts:
	file
Merge pull request #1 from cliffspencer/changes

from changes branch