Submit on 20131203 for the old sesign, and is gonna develop according to the newer design.
Merge branch 'local-master-20131202'