Commit 83ada0b076ea9b0ef79b6bfe26797f2f8f48e1e8

Kano 2013-12-22T21:22:20

Merge remote-tracking branch 'conman/master'