Sync'd branch integration/b2g-inbound with upstream @ Tue Oct  7 16:53:42 PDT 2014