As per #38
Merge remote-tracking branch 'origin/pre07' into pre07