Merge '@shaunfreeman:feature/zend.filter.upper-case-words.rst' and Close #1331