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