Merge gotham beta3

Following exchanges with devs, the master branch will follow the gotham branch (while master-pr will continue to track xbmc master branch)
Here is PR to sync with beta3 tag...