Merge remote-tracking branch 'XTUPLE/4_7_x' into 24405
authorLinda Nichols <lynnaloo@gmail.com>
Wed, 27 Aug 2014 04:55:37 +0000 (04:55 +0000)
committerLinda Nichols <lynnaloo@gmail.com>
Wed, 27 Aug 2014 04:55:37 +0000 (04:55 +0000)

Trivial merge