Merge certain commits from REST branch.
This will enable live systems to update from the develop branch and
still be able to server the experimental REST interface.