Updating Elastica to master

Change-Id: I1e015c4048bcdfe7142052c41c15fafa2914e06e