Merge upstream changes

diff --cc Global/JetBrains.gitignore
index 6b3ea2a7a116130fd3418b7ec163f8a42b7e0e44,5d2e327ff3e57193cb95f6da7937a244acf4bd4f..2947063ebafbd051e836f4db50a3d75d44908c5f
--- 1/Global/JetBrains.gitignore
--- 2/Global/JetBrains.gitignore
+++ b/Global/JetBrains.gitignore
@@@ -1,26 -1,33 +1,26 @@@
- # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm
+ # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
 -
 -*.iml
 -
 -## Directory-based project format:
 -.idea/
 -# if you remove the above rule, at least ignore the following:
 +# Reference https://intellij-support.jetbrains.com/entries/23393067
  
  # User-specific stuff:
 -# .idea/workspace.xml
 -# .idea/tasks.xml
 -# .idea/dictionaries
 -# .idea/shelf
 +.idea/workspace.xml
 +.idea/tasks.xml
 +.idea/dictionaries
  
  # Sensitive or high-churn files:
 -# .idea/dataSources.ids
 -# .idea/dataSources.xml
 -# .idea/sqlDataSources.xml
 -# .idea/dynamic.xml
 -# .idea/uiDesigner.xml
 +.idea/dataSources.ids
 +.idea/dataSources.xml
 +.idea/sqlDataSources.xml
 +.idea/dynamic.xml
 +.idea/uiDesigner.xml
  
  # Gradle:
 -# .idea/gradle.xml
 -# .idea/libraries
 +.idea/gradle.xml
 +.idea/libraries
  
  # Mongo Explorer plugin:
 -# .idea/mongoSettings.xml
 +.idea/mongoSettings.xml
  
  ## File-based project format:
 -*.ipr
  *.iws
  
  ## Plugin-specific files: