Fixed bug in FilterCtrl with merging filters properly.
Merge master into branch dreamhost
Version 123ebedc-da5f-11e2-9e90-00238b21b463