Elastica to master to pick up i18n + message fix

Change-Id: I767de04bbb0e6a84c429b46b361a28fbf2dcc4aa