Sync'd branch integration/inbound with upstream @ Tue Nov  4 18:13:42 PST 2014