@Singleton annotation for dependencies only works on @Provides methods, not constructors
Merge remote-tracking branch 'origin/master'