From comment on issue #3265319: Update patch to take into account the most recent 2.1.4 release, which adds in some of the changes from previous patches.