Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
122289ff Add FaceAttachable interface to handle Grindstone facing in common with Switches
a6db750e SPIGOT-5647: ZombieVillager entity should have getVillagerType()
CraftBukkit Changes:
bbe3d58e SPIGOT-5650: Lectern.setPage(int) causes a NullPointerException
3075579f Add FaceAttachable interface to handle Grindstone facing in common with Switches
95bd4238 SPIGOT-5647: ZombieVillager entity should have getVillagerType()
4d975ac3 SPIGOT-5617: setBlockData does not work when NotPlayEvent is called by redstone current
--- work/CraftBukkit
Submodule work/CraftBukkit 297ff400..83af86db:
> SPIGOT-5457: Downgrade 'Mismatch in destroy block pos' message to debug
> SPIGOT-5481: PlayerBedLeaveEvent returns wrong bed location
> SPIGOT-5482: Structure Block setUsageMode encounters NullpointerException
> SPIGOT-5426: isSimilar for player heads fails
> SPIGOT-5478: XP not dropping when a player dies
--- work/Spigot
Submodule work/Spigot 05bb8bcf..492a7792:
> Rebuild patches
Aikar
Spottedleaf
Brokkonaut
Zach Brown
Shane Freeder