Sync'd branch releases/beta with upstream @ Mon Sep 29 07:40:41 PDT 2014