locks should occur inside try/catch
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x