Merge remote-tracking branch 'XTUPLE/4_7_x' into 24344-2
authorSteve Hackbarth <stephenhackbarth@gmail.com>
Thu, 21 Aug 2014 04:56:23 +0000 (23:56 -0500)
committerSteve Hackbarth <stephenhackbarth@gmail.com>
Thu, 21 Aug 2014 04:56:23 +0000 (23:56 -0500)

Trivial merge