Update to avoid conflicts.
Merge pull request #1139 from spencerfinnell/master

Post Type Priority