Merge diverged branch 'pulsar-fitfun' into 'master'