Elastica to master

Change-Id: Iaefc481e61dd46808066d8d0dcf06fa1c2634871