Change-Id: I3972016d65b789be5c689582afd7d6b9968b0767
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>