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