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