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