[Review] Request from 'b4mboo' @ 'b4mboo/trash/review_120921_minus_cupcake'

Please review the following changes: