re #452 Branching out for change

Change as suggested in ticket 452 on assembla
Merge remote-tracking branch 'origin/master' into 452----Cooldowns
#452 Trying this

Not passing the guid from consume/produce seems to fix it. Seems
everything works as normal.
re #452 Commiting something i forgot

Has this on my changes but did not commit it for some reason. Opps.
Merge pull request #14 from Pilus/452----Cooldowns

452    cooldowns