Merge 'next' branch to update packages.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>