Change-Id: I3ee00af335ac8009e420339a650b9532addf189a Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>