Merge branch 'xcode-6-librarian-flags' into release
Merge branch 'FindQt4-more-plugins' into release
Merge branch 'release'
Merge branch 'master' into next