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