Fix proposal for issue #128
@bric3 feedback taken into account
Merge branch 'bug#128' of https://github.com/pbielicki/mockito into bug#128

Conflicts:
	src/org/mockito/internal/util/reflection/GenericMetadataSupport.java
	test/org/mockito/internal/util/reflection/GenericMetadataSupportTest.java