Sync'd branch integration/inbound with upstream @ Mon Nov  3 23:25:38 PST 2014