Finish merge...

Created by  Ed L  on March 3, 2018
6ZQNDBEETYTQRJL3LC5VUCDE3QMAS5Y4ADZBD223M7ENQJMG5ZFAC
Change contents