Merge remote-tracking branch 'XTUPLE/4_7_x' into fielddev
authorSteve Hackbarth <stephenhackbarth@gmail.com>
Wed, 20 Aug 2014 15:08:12 +0000 (10:08 -0500)
committerSteve Hackbarth <stephenhackbarth@gmail.com>
Wed, 20 Aug 2014 15:08:12 +0000 (10:08 -0500)

Trivial merge