Sync'd branch releases/beta with upstream @ Fri Oct 31 14:29:28 PDT 2014