Sync'd branch releases/beta with upstream @ Wed Sep 17 14:13:31 PDT 2014