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