Collapse canary/dev. Also "proposed" to filters. Fixed issue #11.