Sync'd branch releases/beta with upstream @ Fri Oct 24 04:08:38 PDT 2014