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