comments
Merge remote-tracking branch 'upstream/master'
fixed year indicator tooltip text
minor fixes
does not include companion if disabled
datatype switch
Merge remote-tracking branch 'upstream/master'
Merge pull request #217 from jpecht/master

year fix / disabled companion support