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