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