Merged changes from revisr.kittenz.tv on 06.25.2014