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

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

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