Client side re-do, 20140912-3
 - License fixup