mooo's april-june coding

Merged moneromooo-monero requested to merge moneromooo-monero/ccs-proposals:mooo-2018-04 into master Mar 15, 2019