Merge pull request #1904 from xtuple/4_7_x 4_8_x
authorSteve Hackbarth <stephenhackbarth@gmail.com>
Fri, 3 Oct 2014 21:09:28 +0000 (17:09 -0400)
committerSteve Hackbarth <stephenhackbarth@gmail.com>
Fri, 3 Oct 2014 21:09:28 +0000 (17:09 -0400)
merge forward 4_7_x into 4_8_x


Trivial merge