Up to date with master & gecko

look at the other branches for info.