IXR: Merge latest changes from upstream.


git-svn-id: http://textpattern.googlecode.com/svn/development/4.x@5866 2fea6a4d-a838-0410-917b-93a53c48e9d2