Merge after combining two existing Fogbugz plugins