Merge branch 'master' into nightly

This commit is contained in:
Jens Petersen 2017-05-01 01:13:32 +09:00
commit 583e30e6a9