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