Merge master

Merge branch 'master' into pmmc

# Conflicts:
#	.Rbuildignore
#	.gitignore
#	R/mice-package.R
#	R/mice.impute.pmm.R

.Rbuildignore

@@ -15,4 +15,6 @@ index.Rmd
 ^docs*
 _pkgdown.yaml
 .png
-^script*
+^script$
+^CODE_OF_CONDUCT*
+^mice\.Rproj$

.gitignore

@@ -10,4 +10,4 @@ inst/doc
 /revdep/library.noindex
 /revdep/data.sqlite
 /revdep/*.html
-*script
+script

CODE_OF_CONDUCT.md

@@ -0,0 +1,76 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+ advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+ address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+ professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at stef.vanbuuren@tno.nl. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see
+https://www.contributor-covenant.org/faq

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: mice
 Type: Package
-Version: 3.10.0.9000
+Version: 3.11.7
 Title: Multivariate Imputation by Chained Equations
-Date: 2020-07-13
+Date: 2020-10-25
 Authors@R: c(person("Stef", "van Buuren", role = c("aut","cre"),
     email = "stef.vanbuuren@tno.nl"),
     person("Karin", "Groothuis-Oudshoorn", role = "aut",
@@ -13,6 +13,8 @@ Authors@R: c(person("Stef", "van Buuren", role = c("aut","cre"),
     email = "R.M.Schouten@uu.nl"),
     person("Alexander", "Robitzsch", role = "ctb",
     email = "robitzsch@ipn.uni-kiel.de"),
+    person("Patrick", "Rockenschaub", role = "ctb",
+    email = "rockenschaub.patrick@gmail.com"),
     person("Lisa","Doove", role = "ctb",
     email = "lisa.doove@ppw.kuleuven.be"),
     person("Shahab","Jolani", role = "ctb",
@@ -39,6 +41,7 @@ Imports:
     graphics,
     lattice,
     methods,
+    Rcpp,
     stats,
     tidyr,
     utils
@@ -72,8 +75,8 @@ Encoding: UTF-8
 License: GPL-2 | GPL-3
 LazyLoad: yes
 LazyData: yes
-URL: https://github.com/stefvanbuuren/mice, https://stefvanbuuren.name/mice/, https://stefvanbuuren.name/fimd/
-BugReports: https://github.com/stefvanbuuren/mice/issues
+URL: https://github.com/amices/mice, https://amices.github.io/mice/, https://stefvanbuuren.name/fimd/
+BugReports: https://github.com/amices/mice/issues
 RoxygenNote: 7.1.1
 LinkingTo: 
     Rcpp