Sync'd branch releases/beta with upstream @ Sun Nov  2 23:57:37 PST 2014