Commit 167b787ec51962b6a33b59ab7d4b24a8ac162ff1

kanoi 2014-04-26T17:14:02

Merge remote-tracking branch 'conman/master'