Sync'd branch releases/beta with upstream @ Tue Aug 26 18:53:32 PDT 2014