Sync'd branch releases/beta with upstream @ Mon Sep  8 12:48:05 PDT 2014