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