Sync'd branch releases/beta with upstream @ Tue Oct 14 06:07:38 PDT 2014