Squashed 'bin/' changes from 3ddac64..00d36fb

00d36fb Merge commit '7ef48bd5aa6680d02589a9f5697b35cd9a9520ca' into develop
f5f2c1c Update pre-commit hook to look for staged php files

git-subtree-dir: bin
git-subtree-split: 00d36fb701989fd0d08036fb13967e18ed7e2564
Merge commit 'a8e1f4d295240767c18d9be7211d5d133e3f98b4' into develop

Conflicts:
	bin/pre-commit