syncing with latest master full diff: cb01202de8...3e32104e0e Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
cb01202de8...3e32104e0e