Sync'd branch releases/beta with upstream @ Mon Sep  8 18:42:45 PDT 2014