Sync'd branch releases/beta with upstream @ Mon Sep 15 12:16:28 PDT 2014