Sync'd branch integration/inbound with upstream @ Tue Nov  4 16:53:41 PST 2014