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