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