Sync'd branch releases/aurora with upstream @ Mon Sep 15 08:36:34 PDT 2014