Sync'd branch integration/inbound with upstream @ Tue Nov 11 21:29:56 PST 2014