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