Sync'd branch releases/b2g28_v1_3 with upstream @ Wed Sep  3 06:31:35 PDT 2014