Merge factoid changelog branch