Merge branch '1133434-panels-layouts' of git.drupal.org:project/bluecheese into 1133434-panels-layouts