Change-Id: I6b533543a998e04b3496ce2eb480bc0ee14dcbb7 Reviewed-by: Daniel Teske <daniel.teske@digia.com>