Merge branch 'master' into master

diff --cc Global/JetBrains.gitignore
index de088f0b1859f962e421a52a698776e60d5daa86,e2c9c9e2c5d832eed72775a24cc755211f6c0517..02d16aae38c6fdab63f9d5e14b2b4e1a92dccdff
--- 1/Global/JetBrains.gitignore
--- 2/Global/JetBrains.gitignore
+++ b/Global/JetBrains.gitignore
@@@ -20,16 -22,15 +22,14 @@@
  .idea/**/libraries
  
  # CMake
 -cmake-build-debug/
 -cmake-build-release/
 +cmake-build-*/
  
- # Mongo Explorer plugin:
+ # Mongo Explorer plugin
  .idea/**/mongoSettings.xml
  
- ## File-based project format:
+ # File-based project format
  *.iws
  
- ## Plugin-specific files:
- 
  # IntelliJ
  out/