Terry Merge (With Jamie's stuff)

Signed-off-by: Jamie White <hello@jamie-white.com>
Merge branch 'refs/heads/master' into dev