steveathon/cups — pull request #1 by steveathon (2014-04-13 12:02:57+00:00)
Title: Branch 1.7 Merge

Pulling the changes from 1.7.2 (stable) into 1.6.

Here we go!