Sync from knowtific/helppuff@90bd497
Sync from knowtific/helppuff@065359d
Sync from knowtific/helppuff@ce84fda
Sync from knowtific/helppuff@ef8a3d8