Sync'd branch releases/beta with upstream @ Fri Oct 31 09:38:32 PDT 2014