Merge remote-tracking branch 'origin/wide_char_warning_log' into ancona
Mark Ellis [Thu, 8 May 2014 14:23:41 +0000 (15:23 +0100)]

Trivial merge