Change-Id: I9d8764d11298094c302ae3c979e3bbc23ec68e20
Reviewed-by: Christian Stenger <christian.stenger@digia.com>