Commit cf30053793b128546c7e6b7d508e9f7a266c80cb

Kano 2013-08-12T08:35:29

Merge remote-tracking branch 'conman/master'