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