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