Change-Id: I359af17fcbc67149fab4e291142523b436a43832
Reviewed-by: Robert Loehning <robert.loehning@digia.com>