Update dependencies.
Merge remote-tracking branch 'upstream/master'
Ignore .idea files