Upgrade to rhino 2.1.1
Merge remote-tracking branch 'upstream/master' into UserMessageTypes21
upgrade to bonaparte 1.7.9