Rejigged to be a proper fractional beast
Merge remote-tracking branch 'origin/master'