Merge branch '1.7'

Authored by zhanghuijie on Oct 4 2015, 6:25 AM.

Description

Merge branch '1.7'

Merged Changes

CommitAuthorDetailsCommitted
3d2501acb133zhanghuijie
ensure topData->m_importers/topData->m_importedContexts is not nullptr, this… 
Oct 4 2015
dbde0afea242aspotashev/kfunk
filetemplates: Automatically create directory for license templates 
Sep 8 2015