Updating after qa-tools/qa-tools#67 merge