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