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