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