Merge pull request #3796 from akallabeth/scan_warning_fixes_v2 2.0.0-beta1+android10
authorNorbert Federa <nfedera@users.noreply.github.com>
Fri, 3 Mar 2017 13:41:11 +0000 (14:41 +0100)
committerGitHub <noreply@github.com>
Fri, 3 Mar 2017 13:41:11 +0000 (14:41 +0100)
Scan warning fixes v2


Trivial merge