Tentatively finished myapnea/www_myapnea_org#123
Merge branch '2-0-dev' into 2-0-stable