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