Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anton Grigoryev 2015-03-17 17:26:53 +03:00
commit de05aad138