Merge changes from cybertiger:master