Rebase new_ceres branch on top of new master #954

Closed
ghallak wants to merge 22 commits from ghallak/new_ceres_rebased into new_ceres