Merge branch 'concurrency-fix'
John Napiorkowski [Sat, 20 Jul 2013 19:37:14 +0000 (15:37 -0400)]

Trivial merge