Merge remote-tracking branch 'tuncer/fix-dialyzer'