Sync'd branch integration/inbound with upstream @ Tue Nov  4 10:28:33 PST 2014