Mutex is now optional for cond var
Merge commit 'e1d4f08e3f03728d7eb3022c00a920323289615f'