Ocamlot triage 20130902

More triage results from yesterday for #1029