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