Sync'd branch integration/inbound with upstream @ Tue Nov  4 14:21:44 PST 2014