makotok Merge branch 'dev'

Latest commit 84bcfdf

Feb 5, 2017