Merge in @tw2113's shortcode embedder branch