Merge with head from jdjkelly/quant

Merge with head from jdjkelly/quant