Merging fix to 1.9-maint.
Adding idea to git ignore.