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