first production commit, based on asteven/production 2013/08/19