Bug Report Fix.
Merge branch 'master' of https://github.com/Toro-Unit/custom-post-type-permalinks