merged until b6c2ee4 on upstream master

Signed-off-by: Floyd Pink <imbleedingme@googlemail.com>
merged from upstream master until 4b7f9bb

Signed-off-by: Floyd Pink <imbleedingme@googlemail.com>