Sync'd branch releases/beta with upstream @ Fri Oct  3 14:45:33 PDT 2014