Merge branch 'bug-d' of https://github.com/coreyshaffer/sample-git-workflow into update-c

Conflicts:
	sample.php