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