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

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