Merge branch 'fix-1165'

Global/JetBrains.gitignore

 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm
 
-## Directory-based project format
-.idea/
 /*.iml
-# if you remove the above rule, at least ignore user-specific stuff:
+
+## Directory-based project format:
+.idea/
+# if you remove the above rule, at least ignore the follwing:
+
+# User-specific stuff:
 # .idea/workspace.xml
 # .idea/tasks.xml
 # .idea/dictionaries
-# and these sensitive or high-churn files:
+
+# Sensitive or high-churn files:
 # .idea/dataSources.ids
 # .idea/dataSources.xml
 # .idea/sqlDataSources.xml
 # .idea/dynamic.xml
-# and, if using gradle::
+# .idea/uiDesigner.xml
+
+# Gradle:
 # .idea/gradle.xml
 # .idea/libraries
 
-## File-based project format
+# Mongo Explorer plugin:
+# .idea/mongoSettings.xml
+
+## File-based project format:
 *.ipr
 *.iws
 
-## Additional for IntelliJ
+## Plugin-specific files:
+
+# IntelliJ
 out/
 
-# generated by mpeltonen/sbt-idea plugin
+# mpeltonen/sbt-idea plugin
 .idea_modules/
 
-# generated by JIRA plugin
+# JIRA plugin
 atlassian-ide-plugin.xml
 
-# generated by Crashlytics plugin (for Android Studio and Intellij)
+# Crashlytics plugin (for Android Studio and IntelliJ)
 com_crashlytics_export_strings.xml