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