Set defaults to 2007-2012
Calculate the defaults based, instead of hard-coding
Merge branch 'hotfix_0.6.5' into develop