Commit 2cb9d4c183afc838ecf2ba0d47814e9eaa6f09c6

Michiharu Ariza 2018-12-05T11:25:29

Merge branch 'master' into cff-fixbcd