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