Change-Id: I3821a8817bbb7e76f95f53d058c2f1599320bff7 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>