QA bug fixes for zingermans
Merge pull request #689 from Tendrid/develop

QA bug fixes for zingermans