Merge remote-tracking branch 'refs/remotes/origin/master' into master.listview

Conflicts:
	src/components/buttons/buttonview.coffee