Sync'd branch releases/beta with upstream @ Mon Sep 15 15:40:31 PDT 2014