Updated from svn (r2589).
Merge remote-tracking branch 'hm-blender/master'

* hm-blender/master:
  Updated from svn (r2589).