Merge in Dunedin 2014

many change wow