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