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