Merge remote-tracking branch 'XTUPLE/4_7_x' into 24394
authorLinda Nichols <lynnaloo@gmail.com>
Wed, 27 Aug 2014 16:06:05 +0000 (16:06 +0000)
committerLinda Nichols <lynnaloo@gmail.com>
Wed, 27 Aug 2014 16:06:05 +0000 (16:06 +0000)

Trivial merge