Merge pull request #2138 from dstftw/lynda-membership-support