Merge remote-tracking branch 'origin/master' appcode/144.1993 clion/144.1989 clion/144.1991 dbe/144.1990 idea/144.1992 phpstorm/144.1986 phpstorm/144.1996 pycharm/144.1997 pycharm/144.2000 pycharm/144.2001 rubymine/144.1998 webstorm/144.1999
authorAndrey Vlasovskikh <andrey.vlasovskikh@gmail.com>
Wed, 9 Dec 2015 21:29:19 +0000 (00:29 +0300)
committerAndrey Vlasovskikh <andrey.vlasovskikh@gmail.com>
Wed, 9 Dec 2015 21:29:19 +0000 (00:29 +0300)

Trivial merge