Sync'd branch integration/inbound with upstream @ Tue Nov  4 10:57:31 PST 2014