Merge proposals

Charles Stevenson's CryptFS Wrapper has no merge proposals.