Sync'd branch integration/inbound with upstream @ Tue Nov  4 16:55:40 PST 2014