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

* hm-blender/master:
  Updated from svn trunk (r3162).
Updated from svn trunk (r3179).
Merge remote-tracking branch 'hm-blender/master'

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