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