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