merged with upstream master

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