Sync'd branch releases/beta with upstream @ Tue Sep 30 05:09:43 PDT 2014