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

Trivial merge