Sync'd branch integration/b2g-inbound with upstream @ Fri Sep  5 15:42:34 PDT 2014