Fork of Fish and Wildlife incorporating 1.1 fixes from the linked thread.

Please disregard the changelog, it was incorrect in the original and I didn't modify it when making the necessary fixes for 1.1 compatibility.