Revert "Revert "Merge remote-tracking branch 'cappuccino/master'""

This reverts commit bb506d3709cd79e10ea2e208667dab2d797deb87.