Commit 6cb63e71cf51e48df3b61737e5cbf55868ab7381

Kano 2013-12-03T02:50:44

Merge remote-tracking branch 'conman/master'