Sync'd branch integration/b2g-inbound with upstream @ Fri Sep  5 11:58:43 PDT 2014