Generated master for commit 19fb054
Author: Paul P.H. Wilson <wilsonp@engr.wisc.edu>

    Fix build errors/warnings