Sigtrap19 #2110

Merged
merged 3 commits into from Feb 13, 2013

These merge commits were added into this branch cleanly.

There are no new changes to show.