Change-Id: Ib3ccf13badf710afc95cccbbab6d6b01d9a00e6a
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>