Merge branch 'bugreport_108017'
Samuel Kaufman [Tue, 8 Dec 2015 16:28:40 +0000 (16:28 +0000)]

Trivial merge