diff --git a/lecturecommon.sty b/lecturecommon.sty
index 62e37ee..cf8cb8f 100644
--- a/lecturecommon.sty
+++ b/lecturecommon.sty
@@ -1,4 +1,4 @@
-\def\filedate{26 September 2017}
+\def\filedate{4 October 2018}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % Common definitions shared across the various lecture document classes.
@@ -16,11 +16,12 @@
 % v1.2.2 Fixed incorrect Roman font in math mode.
 % v1.2.3 Switched XeLaTeX fonts to new University standard (Minion Pro + Open Sans).
 % v1.2.4 Fixed "class number plus one" so that it can be passed as a number to other macros.
+% v1.2.5 Disabled Mapping=tex-text for mono font to eliminate automatic curly quotes.
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \NeedsTeXFormat{LaTeX2e}[2001/06/01]
-\ProvidesPackage{lecturecommon}[2017/09/26 INFO standard lecture setup v1.2.4]
+\ProvidesPackage{lecturecommon}[2018/10/04 INFO standard lecture setup v1.2.5]
 
 
 % Standard packages common to ALL lecture documents.
@@ -36,13 +37,15 @@
 \RequirePackage{xunicode}
 \RequirePackage{xltxtra}
 
-\defaultfontfeatures{Mapping=tex-text}
 % The following line is equivalent to:
 %   \setmainfont{Minion Pro}
 %   \setmathsfont(Latin,Digits){Minion Pro}
 %   \setmathrm{Minion Pro}
-\setprimaryfont{Minion Pro}
-\setsansfont[Scale=MatchUppercase,BoldFont={Open Sans}]{Open Sans Light}
+\setprimaryfont[Mapping=tex-text]{Minion Pro}
+\setsansfont[Mapping=tex-text, Scale=MatchUppercase, BoldFont={Open Sans}]{Open Sans Light}
+% Explicitly specify Mapping=tex-text only for the primary and sans fonts,
+% otherwise curly quotes will automatically appear in the mono font. Since
+% this is pretty much exclusively used for code listings, this is a bad thing.
 \setmonofont[Scale=MatchLowercase]{Letter Gothic 12 Pitch}
 
 % Hack to prevent digits in hyperlinks from being set in the main font instead of the mono font.