Merge branch 'master' of github.com:mportuesisf/robolectric