commit b7adf88beb589d75aa5e0e218bfc50a537478be1 parent 9207aa2841ab24127be30f1a119ee05a6c28ccf5 Author: Davide P. Cervone <dpvc@union.edu> Date: Thu, 16 May 2013 19:18:24 -0400 Merge branch 'v2.2-beta' This brings master up to date for v2.2-latest. Diff is too large, output suppressed.