Jambase #3

# Change User Description Committed
#3 1270 Matt Armstrong In prep for publishing all my patches to jam.
#2 1088 Matt Armstrong Merge in changes from upstream.
#1 289 Matt Armstrong Initial branch.