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