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