Fix: post type settings works again.
Merge remote-tracking branch 'upstream/master': Merging fixes from source repo
Merge branch 'master' into development