Sync'd branch releases/beta with upstream @ Thu Oct 23 05:56:36 PDT 2014