Merge changes from eucalyptus/micro-qa.