BUG: fix deactivation of packages with same build number
Merge branch 'master' of github.com:ContinuumIO/conda