Merge remote-tracking branch 'kahrl/sectors2sqlite-fix'