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