Sync'd branch releases/beta with upstream @ Sat Sep  6 11:13:28 PDT 2014