Sync'd branch integration/inbound with upstream @ Tue Nov  4 03:56:36 PST 2014