Sync'd branch releases/beta with upstream @ Mon Sep  8 10:17:28 PDT 2014