gustafn
committed
on 20 May 18
use standard return mechanism, when no master is used