Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Megala 2016-10-13 17:02:08 +05:30
commit 7bd78f0558