merge released code back to master