Sync'd branch releases/beta with upstream @ Sun Nov  2 13:50:26 PST 2014