Update 0.5.4

Move to the SNAPSHOT branch with the `2.11` fixes.  This build works great for me.