Sync'd branch integration/b2g-inbound with upstream @ Tue Sep  2 04:29:05 PDT 2014