Update to SVN 1186 (05/17/2013 by Graham)