Merge branch 'msigley-patch20140926'
Merge branch 'phpdocs'