merge from nifty2go

1 job for dobj_experiments in 4 minutes and 9 seconds