Merge pull request #390 from settinghead/master

Enable gapi mock for login popup app
Merge remote-tracking branch 'upstream/master'