Update to latest changes from sk89q/master on 10/20/2013