Merge update from astaxie:master

merge change from https://github.com/astaxie/beego