Sync'd branch releases/beta with upstream @ Sun Sep 28 07:47:40 PDT 2014