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