Phoenix#276, Phoenix#8
Merge remote-tracking branch 'upstream/master'
Phoenix#8
Merge pull request #277 from anoopsjohn/master

Support Distinct Count