Workaround for compilers with no std::nullptr_t in <cstddef>
Merge branch 'develop'