Sync'd branch integration/inbound with upstream @ Tue Nov  4 11:49:35 PST 2014