Merge branch 'master' into dev
support for weighting by unique users
Merge branch 'dev'