Massive commit, primarily does the show who is listening to you
Pulled down from origin and merged