Sync'd branch integration/inbound with upstream @ Wed Nov 12 02:57:01 PST 2014