Merge branch 'next'

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --cc package/ffmpeg/ffmpeg.mk
Simple merge

diff --cc package/gnupg2/gnupg2.mk
Simple merge

diff --cc package/php/Config.ext
Simple merge

diff --cc package/php/php.mk
Simple merge

diff --cc package/postgresql/postgresql.mk
Simple merge

diff --cc package/qt5/qt5base/Config.in
Simple merge

diff --cc package/ruby/ruby.mk
Simple merge