Merge m-i to m-c, a=merge

commitbf98cd4315b5efa1b28831001ad27d54df7bbb68
parent1f6c6d4839eadd9699d4b7f40cc054de3c994c9b
parentf7ccafcb581bdcb1723174a05c92776df5d4e51c
hg6dccae211ae5fec6a1c1244b878ce0b93860154f
gitbf98cd4315b5efa1b28831001ad27d54df7bbb68
authorPhil Ringnalda <philringnalda@gmail.com>
committerPhil Ringnalda <philringnalda@gmail.com>
commit timeTue, 24 Jan 2017 18:53:29 -0800