Merge from git://github.com/jra101/regal.git master