Sync'd branch releases/aurora with upstream @ Tue Sep 23 15:52:33 PDT 2014