Develop -> Master

things are pretty stable right now. Promoting current snapshot to master.