Merge "Patch 2 for master."
tree: 5608cb844b9c91d492424925b114be9bf531a357
  1. gallerycommon/
  2. src/
  3. src_pd/
  4. tests/