Sync'd branch releases/beta with upstream @ Sun Oct 26 15:33:39 PDT 2014