Change-Id: Iea998510555e3762e6a8457bb6e998c3533c2dee Reviewed-by: David Schulz <david.schulz@digia.com>