Changes made by Tim Van Haren (tvanharen@cccom.com).
Merge branch 'master' of https://github.com/timcccom/quidubi.git