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