Merging master into membranes branch