Version 1.02014-03-09T23:35:52.51

First port from 1.x