am 390aceaf: (-s ours) am 7a64e3a6: DO NOT MERGE Set the cap at alpha to 80%...
am 390aceaf: (-s ours) am 7a64e3a6: DO NOT MERGE Set the cap at alpha to 80% of the total available.
Merge commit '390aceaf'
* commit '390aceaf':
DO NOT MERGE Set the cap at alpha to 80% of the total available.