Sync'd branch integration/inbound with upstream @ Wed Nov  5 05:14:35 PST 2014