[do no merge] testing 

This PR brings our local repo up to the latest version from MattN.  I want to try to apply a concurrency bug fix as well.