proofreading
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Support non-default port for async API and streaming API.  Add automation test case for upsert bult with reference object
Merge remote-tracking branch 'upstream/master'
fix contradictory assertion
merge latest changes from rhoegg