Merge branch 'dbreslau-lib-upgrades'