Next Stop merging master 16

rebase



Next Copyright © 2013 M. J. Dominus