Merge "Adding e4crypt support"