Merge branch 'scrud-android'