OSDN Git Service

merge master into dev
authorZhiting Lin <zlin035@uottawa.ca>
Mon, 26 Nov 2018 09:12:59 +0000 (17:12 +0800)
committerZhiting Lin <zlin035@uottawa.ca>
Mon, 26 Nov 2018 09:12:59 +0000 (17:12 +0800)

Trivial merge