Merge remote-tracking branch 'XTUPLE/4_7_x' into 23257-qr-final
authorSteve Hackbarth <stephenhackbarth@gmail.com>
Mon, 8 Sep 2014 20:55:24 +0000 (16:55 -0400)
committerSteve Hackbarth <stephenhackbarth@gmail.com>
Mon, 8 Sep 2014 20:55:24 +0000 (16:55 -0400)

Trivial merge