Merge pull request #137 from xtuple/master

update from master
Merge pull request #2 from xtuple/quote_dev

Merge pull request #137 from xtuple/master