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