updated patches for 2.1-head
added patches for 2.1.3 (fixes #33)