Dev to Master, pre 1.1.0