Merge remote-tracking branch 'origin/debug' into debug

# Conflicts:
#	src/main/java/com/diagbot/config/ResourceServerConfigurer.java