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

* hm-blender/master:
  Updated from svn repository (r2768).
Updated from svn repository (r2803).
Merge remote-tracking branch 'hm-blender/master'

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