Commit a885bec41c9c0bf454e21c4ea25e77d4164ce663

Kano 2013-12-01T13:50:34

Merge remote-tracking branch 'conman/master'