Merge branch 'master' into 'concurrency-check'

# Conflicts:
#   pyopencl/invoker.py
#   test/test_wrapper.py