Sync'd branch integration/inbound with upstream @ Wed Nov  5 01:18:39 PST 2014