Sync'd branch integration/inbound with upstream @ Wed Nov  5 12:21:41 PST 2014