ref: 9aabbe574e648e0a462b211c62da5eb5875343b7
parent: 4acd9ee51a541f94e81457b1a7fb3accbd790696
parent: 3d71446ecb6569add0d9eaf2e7e4a05d99bd2625
author: S. Gilles <sgilles@math.umd.edu>
date: Wed Apr 18 04:30:41 EDT 2018
Merge remote-tracking branch 'ori/master' into HEAD