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