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