beta-20160714
efd0607a · Merge pull request #7798 from tschottdorf/potential-deadlock ·