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