Import of released version 1.3.6.