remerging jonathans branch to master