Commit ac346679080edbd08433be2630f380847ca4ca1e

Kano 2014-05-02T13:50:57

Merge remote-tracking branch 'conman/master'