Sync from knowtific/helppuff@065359d
Sync from knowtific/helppuff@ad4c489
Sync from knowtific/helppuff@ce84fda