Commit c4ada933d2160b48b25c6d69b6f5a81b4c5f60ed

Kano 2013-12-08T21:08:29

Merge remote-tracking branch 'conman/master'