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