Commits

Merge branch 'trunk_merge' into cache_image Merge trunk to cache image: up to 79dca0ba251 dated 10/12/2016. Tested on osx1010test, kite, kituo, mayll, emu, platypus, ostrich, mooohan, quail.
Merge branch 'trunk_merge' into cache_image Merge trunk to cache image: up to 79dca0ba251 dated 10/12/2016. Tested on osx1010test, kite, kituo, mayll, emu, platypus, ostrich, mooohan, quail.