Sync'd branch integration/inbound with upstream @ Wed Nov  5 01:16:38 PST 2014