ATP again now, but a question about URIs and trailing comma
Merge remote-tracking branch 'gerry/devpatch' into develop
more quick patches
Merge remote branch 'ethan/devpatch' into devpatch
Merge branch 'develop' into devpatch
rescue URI errors (and don't make a chunk)