Sync'd branch integration/inbound with upstream @ Tue Nov  4 05:47:35 PST 2014