Pick up latest DI/1 version.
Merge pull request #185 from seancorfield/develop

Pick up latest DI/1 version.