August 17th

Updates from hg pull && hg update on August 17th 2014.