Merge branch 'master' into chads-branch #26

Closed chadalderson closed 8 years ago