nightly update; all fixes of master branch included.