Next Stop merging master 24

Thank you!



Next Copyright © 2013 M. J. Dominus