Sync'd branch integration/inbound with upstream @ Wed Nov 12 21:34:55 PST 2014