Auto-commit from DevShelf.us submit form
Auto-commit from DevShelf.us submit form
fix merge
Merge branch 'cheshirsky-master'