Merge tag 'v1.15.0'

Version 1.15.0
Merge branch 'master' of github.com:dhaley/php-mode