Sync'd branch releases/beta with upstream @ Fri Oct 24 13:42:42 PDT 2014