Sync'd branch releases/beta with upstream @ Mon Sep 29 11:50:35 PDT 2014