Plugin Volley. Cleanup.
Merge branch 'nightly-branch' into origin/master

Conflicts:
	.idea/workspace.xml