Clone
Kristine Hahn <khahn@maprtech.com>
committed
on 05 Sep 15
resolve merge conflict