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

* hm-blender/master:
  Updated from svn repo (r3032).
Updated from svn trunk (r3054).
Updated (early, for the comming testbuild) from svn repro (r3068).
Merge remote-tracking branch 'hm-blender/master'

* hm-blender/master:
  Updated (early, for the comming testbuild) from svn repro (r3068).
  Updated from svn trunk (r3054).