Merge remote-tracking branch 'XTUPLE/4_7_x' into 1855
authorSteve Hackbarth <stephenhackbarth@gmail.com>
Fri, 19 Sep 2014 14:18:01 +0000 (10:18 -0400)
committerSteve Hackbarth <stephenhackbarth@gmail.com>
Fri, 19 Sep 2014 14:18:01 +0000 (10:18 -0400)

Trivial merge