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