Sync'd branch integration/inbound with upstream @ Mon Nov  3 05:37:45 PST 2014