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