Next Stop merging master 8

Stop merging changes from master



Next Copyright © 2013 M. J. Dominus