Sfleckenstein master

Try this merge.