merge production fixes into master #109

Closed pkit closed 9 years ago