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