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