Updating Elastica to master

Change-Id: I71a20b6df6d7c551b705d47aab42326553b4e745