Merge branch 'release/1.0-alpha'
Merge branch 'release/1.0'
Turned off mailing admins when debug is True
Adjusted order of calls in adjust() so can override better
Merge tag '1.0.2' into develop

Improved overrideability of adjust()