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