Merged silly mistake fix from master (miktex/custom build)