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