Merge branch 'Celedhrim-master'