Merge pull request #1767 from koying/droidaddsplash