Merge pull request #364 from jpecht/master

analytics update
Merge remote-tracking branch 'upstream/master'