fte-95
Merge branch 'master' of https://github.com/qiang2liu/drupal_dev_demo
FTE-187
Merge branch 'master' of https://github.com/qiang2liu/drupal_dev_demo