Preparing for the release of v140614
websharks/s2member#199 and websharks/s2member#172
also works toward resolving websharks/s2member#195