Merge with main repo 28 aug 2014 23:13