Commit 12cd3171ba3b84eff9f359778fabcab8f66ce36e

Michiharu Ariza 2019-01-23T14:05:42

Merge branch 'master' into cff-more-arrayof-fixes