Merge pull request #295 from TheBlueMatt/2019-01-holding-cell-limits