Sync'd branch releases/beta with upstream @ Tue Oct 28 19:07:38 PDT 2014