Fixes MAHOUT-1186 (see also https://reviews.apache.org/r/10311 )


git-svn-id: https://svn.apache.org/repos/asf/mahout/trunk@1465122 13f79535-47bb-0310-9956-ffa450edef68
Merge remote-tracking branch 'upstream/trunk' into trunk