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