Pull upstream from Master & SamplingFeatures_em branches

I did a line by line code compare, and once SamplingFeatures_em gets
merged with the Master, then this branch (TaxonomicClassifiers) should
be favored during any merge conflict.