Commit 2eab85a466d8c30983c7b5ab87d517345826e10e

Kano 2014-01-25T14:30:38

Merge remote-tracking branch 'conman/master'