All kinds of good RESTful stuff.
Merge remote-tracking branch 'origin/master'