Sync'd branch integration/b2g-inbound with upstream @ Fri Sep  5 16:03:37 PDT 2014