Make concurrency more robust

Created by  Eelco Dolstra  on May 29, 2015
ENXUSMSVOU3AZFMH2ZXR4ZVPV2LRRQYQJ6IFX33YN6IH2ORSNSAAC
Change contents