Sync'd branch integration/inbound with upstream @ Mon Nov  3 01:00:44 PST 2014