retlehs/roots — pull request #813 by leoken (2013-07-22 06:08:34+00:00)
Title: Sync up with Roots Master 

Sync up with Roots Master