Merging s2Drip changes from Floobits.
https://github.com/WebSharks/s2Member/issues/115