Sync'd branch integration/inbound with upstream @ Mon Nov  3 09:28:46 PST 2014