Backported #261 for an 1.8.1 release (#264)
Backported #261 for an 1.8.1 release (#264)


retr0h/molecule,rgreinho/molecule,kharkevich/molecule,metacloud/molecule,rjfellman/molecule,cimarron-pistoncloud/molecule,rgreinho/molecule,cimarron-pistoncloud/molecule,cimarron-pistoncloud/molecule,metacloud/molecule,metacloud/molecule,rjfellman/molecule,j0lly/molecule,kireledan/molecule,rgreinho/molecule,j0lly/molecule,rjfellman/molecule,retr0h/maquina,j0lly/molecule