Sync'd branch releases/aurora with upstream @ Tue Sep 23 19:51:34 PDT 2014