Change-Id: Ica52f8a9837eb1b041c890181beda839f3b99a4f Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>