update @ Mon Oct  6 21:09:27 PDT 2014
update @ Mon Oct  6 21:29:18 PDT 2014
intermediate merge
draft-hiding update