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

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