Merged teamdisgruntled/master (former teamhacksung) to 1.4RC2