Merge remote-tracking branch 'origin/master'

Conflicts:
	awaitility/src/main/java/com/jayway/awaitility/core/AbstractHamcrestCondition.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	awaitility/src/main/java/com/jayway/awaitility/core/AbstractHamcrestCondition.java