Sync'd branch releases/beta with upstream @ Sat Sep  6 08:40:25 PDT 2014