sync 2014.6.11

sync from douglascraigschmidt