Ninwin

Identical to ninsbl:master except that it can be fast-forward merged onto current master.