merging version 1.2 from the official wordpress.org plugin repo
undo/remove the desired patch so it can be applied separately