Merge commit '0b42ee1dfbb75ecca480e9a8453d5a7496e090dc'

Conflicts:
	build.gradle