Bug fixes:
----------

* Fix backwards incompatibility with conda 4.1 #1528