tracking latest elastica
Merge remote-tracking branch 'huib/new_elastica'