?
Reducing the blink from infinite to once.
Merge remote-tracking branch 'origin/master' into blog

Conflicts:
	.idea/workspace.xml