Sync'd branch integration/inbound with upstream @ Tue Nov  4 01:34:47 PST 2014