Add the latest snapshot of examm-dev/master