Merge branch 'develop' into add/users-last-seen #6983

Job	Run time
Parse.ly: 3.1 filter_enabled	8m 30s
Parse.ly: 3.1 filter_disabled	8m 31s
Parse.ly: 3.1 option_enabled	8m 42s
Parse.ly: 3.1 option_disabled	8m 38s
Parse.ly: 3.1 filter_and_option_enabled	8m 36s
Parse.ly: 3.1 filter_and_option_disabled	8m 31s
Parse.ly: filter_enabled	8m 40s
Parse.ly: filter_disabled	8m 37s
Parse.ly: option_enabled	8m 36s
Parse.ly: option_disabled	8m 42s
Parse.ly: filter_and_option_enabled	10m 10s
Parse.ly: filter_and_option_disabled	8m 33s
	1h 44m 46s

Provide feedback