Commit 36b0758c531ed1c37fbd03a598740ce559f37baa

kanoi 2014-05-02T11:48:06

Merge remote-tracking branch 'conman/master'